Resolve Performance Issues